From: Peter Michael Green Date: Thu, 16 Jan 2020 14:14:52 +0000 (+0000) Subject: Merge tag '14.2.6-1' into bullseye-staging X-Git-Tag: archive/raspbian/14.2.6-1+rpi1~3 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=cc51580116eb05e8268eb02debfe6bcbdd53fe30;p=ceph.git Merge tag '14.2.6-1' into bullseye-staging --- cc51580116eb05e8268eb02debfe6bcbdd53fe30 diff --cc debian/changelog index c4a01b642,515f234cc..b4dd9a1ed --- a/debian/changelog +++ b/debian/changelog @@@ -1,14 -1,19 +1,31 @@@ - ceph (14.2.5-3+rpi1) bullseye-staging; urgency=medium ++ceph (14.2.6-1+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 10.2.5-7.2+rpi1 by Peter Michael Green at Sun, 30 Jul 2017 09:48:17 +0000] + * Add Raspbian to lists of "debian-like" distros. + + Hopefully this will fix site-packages vs dist-packages + build failure in Raspbian. + + [changes introduced in 14.2.5-3+rpi1 by Peter Michael Green] + * Remove problematic gitattributes files. + - -- Peter Michael Green Sun, 12 Jan 2020 00:53:17 +0000 ++ -- Peter Michael Green Thu, 16 Jan 2020 14:14:03 +0000 ++ + ceph (14.2.6-1) unstable; urgency=medium + + [ James Page ] + * [2e50d5b] Fix misnamed package Recommends brbd1 -> librbd1 + * [11df8ed] Add missing debhelper misc:Depends for python3-ceph + * [08c3c8b] Add missing Depends on python3-{distutils,routes} to ceph-mgr-dashboard package + + [ Bernd Zeimetz ] + * [a87f434] Update upstream source from tag 'upstream/14.2.6' + Update to upstream version '14.2.6' + with Debian dir f37aa9f99ec09cc88d8e5e468c1f642fa7f77ef1 + * [e91626b] Revert "Fix ceph-mgr - indefinite queue growth hangs" + This reverts commit 010db9a30458a6417ff667c3c11a3870edb8ee0c. + Patches were applied upstream for 14.2.6 + + -- Bernd Zeimetz Sun, 12 Jan 2020 23:13:27 +0100 ceph (14.2.5-3) unstable; urgency=medium diff --cc debian/patches/series index d533c4f2d,9bd2a8fb8..f93450992 --- a/debian/patches/series +++ b/debian/patches/series @@@ -12,7 -12,3 +12,5 @@@ bluefs-use-uint64_t-for-len.patc fix-clang-build.patch debian-armel-armhf-buildflags.patch fix-bash-completion-location - 32466.patch-1 - 32466.patch-2 +detect-raspbian.diff +remove-problematic-gitattributes-files.patch diff --cc src/civetweb/examples/_obsolete/websocket_client/ssl/server.key.orig index 58e5653ca,58e5653ca..000000000 deleted file mode 100644,100644 --- a/src/civetweb/examples/_obsolete/websocket_client/ssl/server.key.orig +++ /dev/null @@@ -1,18 -1,18 +1,0 @@@ -------BEGIN RSA PRIVATE KEY----- --Proc-Type: 4,ENCRYPTED --DEK-Info: DES-EDE3-CBC,89778A6427F05D4A -- --4aXqO/8oCHVfMLB+a1DfjbXyEddjbd7nB+YVFLPKy68Tam9PRTvC1zRHBet59ll0 --1w7R8tXR6/xH7HRhBeqDHCcuvBhtw3xGxtXWv54WBFhzuq7TvKOAaCFl++cw/JHq --PCS0rAaYnqF2MAgMi7QBjZKmHFHL43Gy60VfOrB0mmOdxqqXA0NBFC2uEd7Z/MAx --S2A85bNJJKQaWEeDThP1u0OOlNCq99lkLJ31jiOH7ntdL0/vqcbZ+PUtdPLwAG4L --1GUHuiC2v5FvDlPiejMk2dvrxCNpcu2e3tQKHpg2KcsTVrpB7EVzRSazln4HywUZ --EJfBvxqqrS7plImZgj4LXSnln0JPuBb+aHnhKIFvisjYSwqDGJnnp/OaD7YdRhYh --UCcL011Ge+yUbRipeAmHdtJlSUSdB14KWq+WdIX/KgCRGx06QZm9s1PBLH+fww+I --EL3A/LFX0a5KUHkCp29akYYv9bUYaQ79Nt7BlaEON+/SW3pJMbGr+nx8aqogr0Yo --SJ/Zz5TSDBhecRjbCDGkT6DizVZ8cbm2xl8QLBd0H+ZA6uYMgfpAOJGrJx3Nm4Lv --prEApgFtjSrsQDGYHAcmDMW1UWOVHuNp7BSvwUze9Ftnzr/jlpdzES2rhgMyGhg1 --0Szbsfs3vgw4iM83LFJXza07GQJzF8gRF79dY5JiQX/sOKUprA6Lofk631jE0G8r --3z59cxblaq9y7EgFsE944Gk7/HIEimBRiqIZzGVJVukD0itynQ+XmYTdbyH1lpvi --c0ZheZPUoGwUW9RYy+nle5gEDFyZWXcCAuJasQvDBXt//r/bso3ZpA== -------END RSA PRIVATE KEY----- diff --cc src/civetweb/resources/cert/client.key.orig index 6b30836ae,6b30836ae..000000000 deleted file mode 100644,100644 --- a/src/civetweb/resources/cert/client.key.orig +++ /dev/null @@@ -1,30 -1,30 +1,0 @@@ -------BEGIN RSA PRIVATE KEY----- --Proc-Type: 4,ENCRYPTED --DEK-Info: DES-EDE3-CBC,161D2DE9FC3C5EE4 -- --U+3WYIvh4n4cJouZXJkuPMUucnymOWME9ZPBs3CzbWao/HSYS7tEh0gUMb6VtkQo --zq/jQUO2aecWC3+LPZlkUGGWwCU3OCgyFW9xiMRduzKhbPUig+4k9aeKki5RypmR --XFnn/W5ddJSHTVgQI0hF7ZxvC86ldBkCHzSwkKyL8dwBNouXyMgl4PfaZ90N3/pZ --jBnuqbwF1EN0V6OYo3QSxsifpu2M62a229yW9U0/vV7bkGgyqTbtV6V6ny5+IWn+ --r99bb+hS1SSt5VVuHfNKh06ww0Mc7bSfeyVcdgoT5ltftsRWEA1Au5DfS+nhztVf --0l/yiMTm60x61WuXsbQz+4hwH7nCAMIFbBmCYbP/eqY9BIiKy9Ue7vOouTHdi7Op --wQL/r3Wc/+IcssoExITnOBX2San6NvtC7ej+8Wf/wKOh5mTp4uT5cbdif3ifj7uo --GmYbWNJSo0VVtl1nru9uSIbJSKVzMcDO2aVbofCGB4KUpkm+3Sw2ZnbJ6o/AVZb3 --ip7NoudU11d6KBzpyvfyFzSNfGVmtasB24BYt22vSQWJ5Ob5MQgg+zFEpGUeoq6p --LqRaZCDqXHsofM49JEbU/32SV3JhSjfzJ9gVG+lymGZIdmYD4y+SH/6K0QtCN9cY --7++96vAPYgKmJ6vK1N8o6owDkxQ3+FilKWanp2rwETc1RyWSg5hi62+8YllmsQXc --3zvFXgCS+yfAKXqtHTugtb6c8o2RuPdpNtVmtncEnf3OeuP/gDbqLumzHRDQk+o1 --rgGiLsvY4MmbmS0D/c4NZ8fyBqN7d2TRHnHS6mpqgzpKHOuRPmLQ+azmf3ISY9m4 --H8ROjKqTMHUfxQRKizHPTRjtvYjk/uXBrpnDa2buPaW+m1brsiHdhruhB6QPaJGQ --8uFFHyur5ZRMQhST/fWLmNxPX9CAsXBuKm1cPJWw+QzR8uo7bFwups1ODrLj0L0U --ECAq343KS6aoCMoLGw4EZRHeSdrequtsaGFHMtweSxs7PJR+UVLf/JSw4f0L4Pa8 --GvY9nBGrI/uoN4H88YR1NjxLCzU5mZ3yLV4ZL9zGq1gX5ZfAr1b9i2pJI4daBFvW --gJBSzoiN9dq4I4ZZgZ7KSTG2n2mnPPlOhAIgabwpDb2buf0GrZYhgby78Vwy3bdb --Yk8ToEvLnKzDH8P4JjClIVC7R+bfH1uUO+uDRYZBlpkzc0+HgagW0vt9xZpWrdOm --DJeZ7/ciCbD+90b1mc8xkPgegKjvrMfEMk81GEGhv28FpIbEAX9nuA4UaQHI58s/ --tgQ3kThVrlJCC/77teNMubcIWycV8ufm4NgDeGtmIP47Z9Vdrv+VFv0hib3hch9M --7lIJX0aSVRHhEFi6QquQmTlvEB/Z8T640k9ZGiTgkGEFrEh6nnGeiLP+WJodLd/u --CKkx3KLEi8T90dsPhyo852o+oKOFMA/nEGEOBE7VcgOGkZ2NTBOerVZrBp6T0PGi --0x2A32YDMjeI19CdsvxgIq7wj9wXuWDXAFV2Ond75XwM4CnGSKefh+Z82ZlfnmNf --GyKsUSn0Nno58y5LLzXw06E4Wp4WtQcw4KiiaEYA6s92RAsoslY6XqdYSeSvtSz2 -------END RSA PRIVATE KEY----- diff --cc src/civetweb/resources/cert/server.key.orig index e99f08e8f,e99f08e8f..000000000 deleted file mode 100644,100644 --- a/src/civetweb/resources/cert/server.key.orig +++ /dev/null @@@ -1,30 -1,30 +1,0 @@@ -------BEGIN RSA PRIVATE KEY----- --Proc-Type: 4,ENCRYPTED --DEK-Info: DES-EDE3-CBC,9D77FEDB1409D1BC -- --uC330C4tHeQ7HAGqwIlcTtZia9xbCwMAkUn/PJxdsRqk+vZ3NcheeWdSbq9BMioM --06Vl0DtlhfAr4kF/IDhRCkUsLafPFaiDoAiSjZx9xOoCpSdJTe8W19vq6bf9nE1t --WKLR7Ot73E5Qinzpon0ewqia3bDgAgZsE4o99HmXKHghlSPV2we6ROMWn3QfoEfE --tTCIhDrgsrCobrMtDdlzTe6FHACc5nrVloq9LCynuoig2/W1eGS0WVPWMMuo09Qn --UQbjANNSfZcSWZTg1ynCqk74W1X/0hPo2/FpEPIV3K4ZykKbqgB4HIerZ/sJO2LF --g5KtRBtyqj/OsTs+v8i2eEtMYEbz17oJfgL8e2R+AD8QKWjEWrgS5R71LrCgX+v3 --+lOANQi+xIaz45h6StnH52Yl+4iQ4KyaKquJ7ZKRJDfKw41SOSAYCUIkm9AGIqN2 --/WHxfDCaJEN4da890AwmEtzIlVf5TRcJYRpCtxP4kNihrjjQddV+LYdg09nMgcoZ --zVk5eXLh6cg0KzKTDbM3AUmedmrj6R+diyE8zkJKKfStJcejhjTB8KxAIsg+JFFj --tnWUv6dHfPq/K3qbMGqJyuST9pjW9xBiIbscc4HOLmfpJHcClYEbDgPbAqnDp8p9 --nAkI1LFqwpix7rKvFsqWgt8B9TCrxdUqKnDYUNXt/9C1o8ZR8muaH1Jpp8xCjve3 --XpTAMj9HVE/pRkySn8YHvehnMK9+UdCy1sO4RoF5qn881sgetDIoZ/825u4erDVf --Az20D0TZ9wBz+BG0MW8DxdOJmKjpW2ew0RlkG9mcMvKvkcl0XbKFqpF1ZqNQxMTt --Gw1Ef5Hu9j+ijpBKb/4Pk7xeC6OaYdu9NxzYQtpC5aCKXwca8VlykBlPFGrN3eBV --wrsQ+aEv+Cf0bziGHPhili5eNRW8F53LqKF9WdmAAHdOPNZR5PHL8FudNRV77pcY --0bXiY3cHD/YnUpXWZYqU3qDabwtExugImYzLrVg+BSZROwvUYwgKmcrTpx6lJjcv --ntoC26QVKAHhnaclBjGZKl0Q+pYZwR0TxEMPiKLe47TBcYTwj8GNrLk1Lf/VJcaz --lntXsqVjCkwT7cFYfeb8XOvBlrTYQA0LlEHbTn9VTwRiM5O2JB0nzoC2q8LXlzki --wC5AECcUhzh2zpVuLB/FttxPT37a3ibJBkX0UHf7CsPoR/FnEYKL6Bytp6bovUYy --Ed3L/DWdGCB0+tMX0+GBcaxAz/Fqe++Hp9FvZx+ob6k86FC50x2lRPRk3jZmmcCp --W1mub0DK1Pbdh2cutmutbqXF5R2bWpK9lRb5jiSJuQPODTLS5TQjnwVYmqv9qszv --lnJ54HtfrMfKIEqE9mzBfJ4agsHXG2HLrsmRzF6jflleeJddLKqJJ7U8sGjwlJAS --0NIKtWmw5kpRKStbLDX+uGuWLQfM4ITX33fIRlujvbeJcFwtmM4i4sJC1yYYOvLQ --aHV46KNkTVYouKMpJVvGWfXfcV90gbD3pYtkN8YAjswtWoQAnOLFwFJrM0HORkpU --173uMGgOA/EoBhS0XQd6k1+y00JPGky8GSWUEPKDoqX/uZl8POO7VcbAtV41Wkq8 -------END RSA PRIVATE KEY----- diff --cc src/civetweb/resources/cert/server_bkup.key.orig index 3e227f271,3e227f271..000000000 deleted file mode 100644,100644 --- a/src/civetweb/resources/cert/server_bkup.key.orig +++ /dev/null @@@ -1,30 -1,30 +1,0 @@@ -------BEGIN RSA PRIVATE KEY----- --Proc-Type: 4,ENCRYPTED --DEK-Info: DES-EDE3-CBC,E700A7E4CCCF78FC -- --1/jqqjzwHWxdTvayJ+y//FTMuxZbIOT8hl4h+4zzh+/o45RHUa8n6nTI3mLSIK/i --6yZqSaPaCiBINcLWmijbeDN73OhVL3rrum1VotcTUTA2LU0M+kLWpmcJrY5lsku2 --2voulXmLoCniup+nhnGXDWOk3jaLsMBOn3kYyVBgphwzGzKinFQnqzo/w6/2pJ/C --iKb/GWNEuXwHkoTz7A4o1ZVVOQyx8h0klWbwjBEPB+cPE3h/bRTkJWTTy2yfCeUC --nyRQ1BkWC6I5LLesC7gG0jsw3rcGkJnu+zNkxG43N9CkU74S/jNwktjqzKiSbO14 --SYu/NiaVLCtQTeaTeh39X8OGW4RzFbO32PVBl0jL5d8h3DpvTufbtC9BS9dADM0o --pwCUVWiKKgApmqhFDyUpQB8ptfLewmp5ksB93NzdlPLV8vojJ7nBOrppaueXKQ6Z --f380J3xCrVN7pTt/yT3mlvCnmb0gNhL6jAE53C112Upjmu40OBhwjGDjDXsOZBmZ --NH0KEsLecIPgbx0W27h0j4JDdXGtI4mjFHHEnFj75We73BZ8BIlyRt7nxS+iFYNH --hpbwuNc4dX953jwPy7CIxyms5cy4BigTv/rsgFWCxWxFcTqYkp6L3z8IC6apJDSp --htKLzhFKjlXqP3vcwZYrAF26eOl6Pxn74853dRskAZNY5F40/7IjVb8l71tedWof --WE5wpuXrZJd+GBeIM+plbPCnBiNSHuRzJPhLU3tsT3X70WfDxgIgM38P5uOOBLma --hU/0wcL8+Q3HESPx5ju+5lYZBmozs5ANwMggXv0a1vBptI/kA0HeMQx52G4m1F+9 --aYRrNc+Exl901Yjn120Y6NllIk5EolsqNifDsems9sTiC91Fvh7yiYI5Pd7qCwoR --2ssLbWda/+bgqtDXjmv4x1btWhWmbInBpCrp1YEwILlyNN6FQ/sQ8pvHtyC9+FcB --xQ7wI0JnsCpj8E+P5C08EEgpTiUfelwYyTZLarAFMRe5HWZjgQW7+JvbiQ4Q3ZXM --/DaYh6zGXvR4OomTqKN63i6iAckS7Uh3/XzaWbjOAxvMIgKhU7OBqDAlPvgXJh1y --sDig2zTR603AURkWZir2OOr7XKZcqNj8lxt+BG+E6bwxdeIeEQn7f8Ef5oUmFNXQ --o5zQwI12RDQXaBRDG/wTONrUhvc8TEM04jNGKMRPU6FlZSEF2zlTSU8/QtO56FwR --MwhPlNUSgWgvqzFWoA4W7XWjAfYqvoVRcLjcZF2WBUJwYq4ZODNqBH+j3+Ftge9l --wKc/9KjcurpAWbg7gq9XtwgiT8bYHcM3NSOwgnrOJ4wtukuwbLq2JjMLgFQeDAev --NFJfbYoZ0iTyIq1WRS0MlhAwDKujDOoQLqkF41LC5Ac6RpMeR689xN18YE6b6iXp --f93tHI+6Ru1I+2ZoGbvCPmasv3jk69C8A/StmUEcFfxmOr5qhQEVR2pIXfXKeqbE --KCUoR4Wax42q/bDhgIOOmq+E9YsTuy4Iq5J25WDIbgWN35s0qXDm91s+aY0KtDUu --fxGdOIHQHx10ARHUKZ6AhXSF+q5QQFy4ejlgiTMorvT0XUHmIQ82hw== -------END RSA PRIVATE KEY----- diff --cc src/erasure-code/jerasure/jerasure/Examples/makefile.orig index d838ee669,d838ee669..000000000 deleted file mode 100644,100644 --- a/src/erasure-code/jerasure/jerasure/Examples/makefile.orig +++ /dev/null @@@ -1,203 -1,203 +1,0 @@@ --# Examples/makefile --# Jerasure - A C/C++ Library for a Variety of Reed-Solomon and RAID-6 Erasure Coding Techniques --# --# Revision 1.2A --# May 24, 2011 --# --# James S. Plank --# Department of Electrical Engineering and Computer Science --# University of Tennessee --# Knoxville, TN 37996 --# plank@cs.utk.edu --# --# Copyright (c) 2011, James S. Plank --# All rights reserved. --# --# Redistribution and use in source and binary forms, with or without --# modification, are permitted provided that the following conditions --# are met: --# --# - Redistributions of source code must retain the above copyright --# notice, this list of conditions and the following disclaimer. --# --# - Redistributions in binary form must reproduce the above copyright --# notice, this list of conditions and the following disclaimer in --# the documentation and/or other materials provided with the --# distribution. --# --# - Neither the name of the University of Tennessee nor the names of its --# contributors may be used to endorse or promote products derived --# from this software without specific prior written permission. --# --# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS --# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT --# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR --# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT --# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, --# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, --# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS --# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED --# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT --# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY --# WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE --# POSSIBILITY OF SUCH DAMAGE. -- --PREFIX=/usr/local --BINDIR=${PREFIX}/bin --LIBDIR=${PREFIX}/lib --INCDIR=${PREFIX}/include --CC = gcc --CFLAGS = -O2 -I$(HOME)/include -- --ALL = jerasure_01 \ -- jerasure_02 \ -- jerasure_03 \ -- jerasure_04 \ -- jerasure_05 \ -- jerasure_06 \ -- jerasure_07 \ -- jerasure_08 \ -- reed_sol_01 \ -- reed_sol_02 \ -- reed_sol_03 \ -- reed_sol_04 \ -- reed_sol_test_gf \ -- reed_sol_time_gf \ -- reed_sol_hard_time_gf \ -- cauchy_01 \ -- cauchy_02 \ -- cauchy_03 \ -- cauchy_04 \ -- liberation_01 \ -- encoder \ -- decoder \ -- --all: $(ALL) -- --clean: -- rm -f core *.o $(ALL) a.out cauchy.h cauchy.c liberation.h liberation.c reed_sol.c reed_sol.h\ -- jerasure.c jerasure.h galois.c galois.h -- --.SUFFIXES: .c .o --.c.o: -- $(CC) $(CFLAGS) -c $*.c -- --liberation.h: ../liberation.h -- rm -f liberation.h ; cp ../liberation.h . ; chmod 0444 liberation.h -- --liberation.c: ../liberation.c -- rm -f liberation.c ; cp ../liberation.c . ; chmod 0444 liberation.c -- --cauchy.h: ../cauchy.h -- rm -f cauchy.h ; cp ../cauchy.h . ; chmod 0444 cauchy.h -- --cauchy.c: ../cauchy.c -- rm -f cauchy.c ; cp ../cauchy.c . ; chmod 0444 cauchy.c -- --reed_sol.h: ../reed_sol.h -- rm -f reed_sol.h ; cp ../reed_sol.h . ; chmod 0444 reed_sol.h -- --reed_sol.c: ../reed_sol.c -- rm -f reed_sol.c ; cp ../reed_sol.c . ; chmod 0444 reed_sol.c -- --jerasure.h: ../jerasure.h -- rm -f jerasure.h ; cp ../jerasure.h . ; chmod 0444 jerasure.h -- --jerasure.c: ../jerasure.c -- rm -f jerasure.c ; cp ../jerasure.c . ; chmod 0444 jerasure.c -- --galois.h: ../galois.h -- rm -f galois.h ; cp ../galois.h . ; chmod 0444 galois.h -- --galois.c: ../galois.c -- rm -f galois.c ; cp ../galois.c . ; chmod 0444 galois.c -- --jerasure.o: jerasure.h galois.h -- --jerasure_01.o: galois.h jerasure.h --jerasure_01: jerasure_01.o galois.o jerasure.o -- $(CC) $(CFLAGS) -o jerasure_01 jerasure_01.o jerasure.o galois.o -lgf_complete -- --jerasure_02.o: galois.h jerasure.h --jerasure_02: jerasure_02.o galois.o jerasure.o -- $(CC) $(CFLAGS) -o jerasure_02 jerasure_02.o jerasure.o galois.o -lgf_complete -- --jerasure_03.o: galois.h jerasure.h --jerasure_03: jerasure_03.o galois.o jerasure.o -- $(CC) $(CFLAGS) -o jerasure_03 jerasure_03.o jerasure.o galois.o -lgf_complete -- --jerasure_04.o: galois.h jerasure.h --jerasure_04: jerasure_04.o galois.o jerasure.o -- $(CC) $(CFLAGS) -o jerasure_04 jerasure_04.o jerasure.o galois.o -lgf_complete -- --jerasure_05.o: galois.h jerasure.h --jerasure_05: jerasure_05.o galois.o jerasure.o -- $(CC) $(CFLAGS) -o jerasure_05 jerasure_05.o jerasure.o galois.o -lgf_complete -- --jerasure_06.o: galois.h jerasure.h --jerasure_06: jerasure_06.o galois.o jerasure.o -- $(CC) $(CFLAGS) -o jerasure_06 jerasure_06.o jerasure.o galois.o -lgf_complete -- --jerasure_07.o: galois.h jerasure.h --jerasure_07: jerasure_07.o galois.o jerasure.o -- $(CC) $(CFLAGS) -o jerasure_07 jerasure_07.o jerasure.o galois.o -lgf_complete -- --jerasure_08.o: galois.h jerasure.h --jerasure_08: jerasure_08.o galois.o jerasure.o -- $(CC) $(CFLAGS) -o jerasure_08 jerasure_08.o jerasure.o galois.o -lgf_complete -- --reed_sol_01.o: galois.h reed_sol.h jerasure.h --reed_sol_01: reed_sol_01.o galois.o jerasure.o reed_sol.o -- $(CC) $(CFLAGS) -o reed_sol_01 reed_sol_01.o reed_sol.o jerasure.o galois.o -lgf_complete -- --reed_sol_02.o: galois.h reed_sol.h jerasure.h --reed_sol_02: reed_sol_02.o galois.o jerasure.o reed_sol.o -- $(CC) $(CFLAGS) -o reed_sol_02 reed_sol_02.o reed_sol.o jerasure.o galois.o -lgf_complete -- --reed_sol_03.o: galois.h reed_sol.h jerasure.h --reed_sol_03: reed_sol_03.o galois.o jerasure.o reed_sol.o -- $(CC) $(CFLAGS) -o reed_sol_03 reed_sol_03.o reed_sol.o jerasure.o galois.o -lgf_complete -- --reed_sol_04.o: galois.h reed_sol.h jerasure.h --reed_sol_04: reed_sol_04.o galois.o jerasure.o reed_sol.o -- $(CC) $(CFLAGS) -o reed_sol_04 reed_sol_04.o reed_sol.o jerasure.o galois.o -lgf_complete -- --cauchy_01.o: galois.h cauchy.h jerasure.h --cauchy_01: cauchy_01.o galois.o jerasure.o cauchy.o -- $(CC) $(CFLAGS) -o cauchy_01 cauchy_01.o cauchy.o jerasure.o galois.o -lgf_complete -- --cauchy_02.o: galois.h cauchy.h jerasure.h --cauchy_02: cauchy_02.o galois.o jerasure.o cauchy.o -- $(CC) $(CFLAGS) -o cauchy_02 cauchy_02.o cauchy.o jerasure.o galois.o -lgf_complete -- --cauchy_03.o: galois.h cauchy.h jerasure.h --cauchy_03: cauchy_03.o galois.o jerasure.o cauchy.o -- $(CC) $(CFLAGS) -o cauchy_03 cauchy_03.o cauchy.o jerasure.o galois.o -lgf_complete -- --cauchy_04.o: galois.h cauchy.h jerasure.h --cauchy_04: cauchy_04.o galois.o jerasure.o cauchy.o -- $(CC) $(CFLAGS) -o cauchy_04 cauchy_04.o cauchy.o jerasure.o galois.o -lgf_complete -- --liberation_01.o: galois.h liberation.h jerasure.h --liberation_01: liberation_01.o galois.o jerasure.o liberation.o -- $(CC) $(CFLAGS) -o liberation_01 liberation_01.o liberation.o jerasure.o galois.o -lgf_complete -- --encoder.o: galois.h liberation.h jerasure.h reed_sol.h cauchy.h --encoder: encoder.o galois.o jerasure.o liberation.o reed_sol.o cauchy.o -- $(CC) $(CFLAGS) -o encoder encoder.o liberation.o jerasure.o galois.o reed_sol.o cauchy.o -lgf_complete -- --decoder.o: galois.h liberation.h jerasure.h reed_sol.h cauchy.h --decoder: decoder.o galois.o jerasure.o liberation.o reed_sol.o cauchy.o -- $(CC) $(CFLAGS) -o decoder decoder.o liberation.o jerasure.o galois.o reed_sol.o cauchy.o -lgf_complete -- --reed_sol_test_gf.o: galois.h reed_sol.h jerasure.h --reed_sol_test_gf: reed_sol_test_gf.o galois.o jerasure.o reed_sol.o -- $(CC) $(CFLAGS) -o reed_sol_test_gf reed_sol_test_gf.o reed_sol.o jerasure.o galois.o -lgf_complete -- --reed_sol_time_gf.o: galois.h reed_sol.h jerasure.h --reed_sol_time_gf: reed_sol_time_gf.o galois.o jerasure.o reed_sol.o -- $(CC) $(CFLAGS) -o reed_sol_time_gf reed_sol_time_gf.o reed_sol.o jerasure.o galois.o -lgf_complete -- --reed_sol_hard_time_gf.o: galois.h reed_sol.h jerasure.h --reed_sol_hard_time_gf: reed_sol_hard_time_gf.o galois.o jerasure.o reed_sol.o -- $(CC) $(CFLAGS) -o reed_sol_hard_time_gf reed_sol_hard_time_gf.o reed_sol.o jerasure.o galois.o -lgf_complete diff --cc src/erasure-code/jerasure/jerasure/include/config.h.in~ index a20c1e3dc,a20c1e3dc..000000000 deleted file mode 100644,100644 --- a/src/erasure-code/jerasure/jerasure/include/config.h.in~ +++ /dev/null @@@ -1,107 -1,107 +1,0 @@@ --/* include/config.h.in. Generated from configure.ac by autoheader. */ -- --/* Support Altivec instructions */ --#undef HAVE_ALTIVEC -- --/* Support AVX (Advanced Vector Extensions) instructions */ --#undef HAVE_AVX -- --/* Define to 1 if you have the header file. */ --#undef HAVE_DLFCN_H -- --/* Define to 1 if you have the header file. */ --#undef HAVE_GF_COMPLETE_H -- --/* Define to 1 if you have the header file. */ --#undef HAVE_GF_GENERAL_H -- --/* Define to 1 if you have the header file. */ --#undef HAVE_GF_INT_H -- --/* Define to 1 if you have the header file. */ --#undef HAVE_GF_METHOD_H -- --/* Define to 1 if you have the header file. */ --#undef HAVE_GF_RAND_H -- --/* Define to 1 if you have the header file. */ --#undef HAVE_INTTYPES_H -- --/* Define to 1 if you have the `gf_complete' library (-lgf_complete). */ --#undef HAVE_LIBGF_COMPLETE -- --/* Define to 1 if you have the header file. */ --#undef HAVE_MEMORY_H -- --/* Support mmx instructions */ --#undef HAVE_MMX -- --/* Support SSE (Streaming SIMD Extensions) instructions */ --#undef HAVE_SSE -- --/* Support SSE2 (Streaming SIMD Extensions 2) instructions */ --#undef HAVE_SSE2 -- --/* Support SSE3 (Streaming SIMD Extensions 3) instructions */ --#undef HAVE_SSE3 -- --/* Support SSSE4.1 (Streaming SIMD Extensions 4.1) instructions */ --#undef HAVE_SSE4_1 -- --/* Support SSSE4.2 (Streaming SIMD Extensions 4.2) instructions */ --#undef HAVE_SSE4_2 -- --/* Support SSSE3 (Supplemental Streaming SIMD Extensions 3) instructions */ --#undef HAVE_SSSE3 -- --/* Define to 1 if you have the header file. */ --#undef HAVE_STDINT_H -- --/* Define to 1 if you have the header file. */ --#undef HAVE_STDLIB_H -- --/* Define to 1 if you have the header file. */ --#undef HAVE_STRINGS_H -- --/* Define to 1 if you have the header file. */ --#undef HAVE_STRING_H -- --/* Define to 1 if you have the header file. */ --#undef HAVE_SYS_STAT_H -- --/* Define to 1 if you have the header file. */ --#undef HAVE_SYS_TYPES_H -- --/* Define to 1 if you have the header file. */ --#undef HAVE_UNISTD_H -- --/* Define to the sub-directory in which libtool stores uninstalled libraries. -- */ --#undef LT_OBJDIR -- --/* Name of package */ --#undef PACKAGE -- --/* Define to the address where bug reports for this package should be sent. */ --#undef PACKAGE_BUGREPORT -- --/* Define to the full name of this package. */ --#undef PACKAGE_NAME -- --/* Define to the full name and version of this package. */ --#undef PACKAGE_STRING -- --/* Define to the one symbol short name of this package. */ --#undef PACKAGE_TARNAME -- --/* Define to the home page for this package. */ --#undef PACKAGE_URL -- --/* Define to the version of this package. */ --#undef PACKAGE_VERSION -- --/* Define to 1 if you have the ANSI C header files. */ --#undef STDC_HEADERS -- --/* Version number of package */ --#undef VERSION diff --cc src/erasure-code/jerasure/jerasure/makefile.orig index f2ffeb0e9,f2ffeb0e9..000000000 deleted file mode 100644,100644 --- a/src/erasure-code/jerasure/jerasure/makefile.orig +++ /dev/null @@@ -1,79 -1,79 +1,0 @@@ --# Makefile --# James S. Plank --# --# JERASURE - Library for Erasure Coding --# Copright (C) 2007 James S. Plank --# --# This library is free software; you can redistribute it and/or --# modify it under the terms of the GNU Lesser General Public --# License as published by the Free Software Foundation; either --# version 2.1 of the License, or (at your option) any later version. --# --# This library is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# Lesser General Public License for more details. --# --# You should have received a copy of the GNU Lesser General Public --# License along with this library; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --# --# James S. Plank --# Department of Electrical Engineering and Computer Science --# University of Tennessee --# Knoxville, TN 37996 --# plank@cs.utk.edu -- --# $Revision: 1.0 $ --# $Date: 2007/09/25 15:12:20 $ -- --UNAME := $(shell uname) -- --ifeq ($(UNAME), Linux) --LIBARGS=-shared -Wl,-soname,libJerasure.so.0 --endif --ifeq ($(UNAME), Darwin) --LIBARGS=-shared -Wl,-install_name,libJerasure.so.0 --endif -- --PREFIX=/usr/local --BINDIR=${PREFIX}/bin --LIBDIR=${PREFIX}/lib --INCDIR=${PREFIX}/include -- --CC = gcc --CFLAGS = -O3 -I${INCDIR} -L${LIBDIR} -fPIC -- --ALL = galois.o jerasure.o reed_sol.o cauchy.o liberation.o lib/libJerasure.so --OBJS = galois.o jerasure.o reed_sol.o cauchy.o liberation.o -- --all: $(ALL) -- --clean: -- rm -f core *.o $(ALL) a.out lib/libJerasure.so.0 -- --lib: -- mkdir -p lib -- --.SUFFIXES: .c .o --.c.o: -- $(CC) $(CFLAGS) -c $*.c -- --galois.o: galois.h --jerasure.o: jerasure.h galois.h --reed_sol.o: jerasure.h galois.h reed_sol.h --cauchy.o: jerasure.h galois.h cauchy.h --liberation.o: jerasure.h galois.h liberation.h -- --lib/libJerasure.so: lib/libJerasure.so.0 -- ln -sf libJerasure.so.0 lib/libJerasure.so -- --lib/libJerasure.so.0: lib $(OBJS) -- $(CC) $(LIBARGS) \ -- -o lib/libJerasure.so.0 $(OBJS) -lgf_complete -- --install: lib/libJerasure.so -- cp -P lib/libJerasure.so* ${LIBDIR} -- mkdir -p ${INCDIR} -- cp *.h ${INCDIR} -- diff --cc src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.sln index b752f876b,b752f876b..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.sln +++ /dev/null @@@ -1,32 -1,32 +1,0 @@@ -- --Microsoft Visual Studio Solution File, Format Version 9.00 --# Visual Studio 2005 --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "gmock.vcproj", "{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}" --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock_test", "gmock_test.vcproj", "{F10D22F8-AC7B-4213-8720-608E7D878CD2}" --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock_main", "gmock_main.vcproj", "{E4EF614B-30DF-4954-8C53-580A0BF6B589}" --EndProject --Global -- GlobalSection(SolutionConfigurationPlatforms) = preSolution -- Debug|Win32 = Debug|Win32 -- Release|Win32 = Release|Win32 -- EndGlobalSection -- GlobalSection(ProjectConfigurationPlatforms) = postSolution -- {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Debug|Win32.ActiveCfg = Debug|Win32 -- {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Debug|Win32.Build.0 = Debug|Win32 -- {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Release|Win32.ActiveCfg = Release|Win32 -- {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Release|Win32.Build.0 = Release|Win32 -- {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Debug|Win32.ActiveCfg = Debug|Win32 -- {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Debug|Win32.Build.0 = Debug|Win32 -- {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Release|Win32.ActiveCfg = Release|Win32 -- {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Release|Win32.Build.0 = Release|Win32 -- {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Debug|Win32.ActiveCfg = Debug|Win32 -- {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Debug|Win32.Build.0 = Debug|Win32 -- {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Release|Win32.ActiveCfg = Release|Win32 -- {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Release|Win32.Build.0 = Release|Win32 -- EndGlobalSection -- GlobalSection(SolutionProperties) = preSolution -- HideSolutionNode = FALSE -- EndGlobalSection --EndGlobal diff --cc src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.vcproj index 4bbfe9899,4bbfe9899..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.vcproj +++ /dev/null @@@ -1,191 -1,191 +1,0 @@@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- diff --cc src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_config.vsprops index 875939c18,875939c18..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_config.vsprops +++ /dev/null @@@ -1,15 -1,15 +1,0 @@@ -- -- -- -- -- diff --cc src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_main.vcproj index 01505a931,01505a931..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_main.vcproj +++ /dev/null @@@ -1,187 -1,187 +1,0 @@@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- diff --cc src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_test.vcproj index d1e01e71a,d1e01e71a..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_test.vcproj +++ /dev/null @@@ -1,201 -1,201 +1,0 @@@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- diff --cc src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.sln index d9496569b,d9496569b..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.sln +++ /dev/null @@@ -1,32 -1,32 +1,0 @@@ -- --Microsoft Visual Studio Solution File, Format Version 11.00 --# Visual C++ Express 2010 --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "gmock.vcxproj", "{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}" --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock_test", "gmock_test.vcxproj", "{F10D22F8-AC7B-4213-8720-608E7D878CD2}" --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock_main", "gmock_main.vcxproj", "{E4EF614B-30DF-4954-8C53-580A0BF6B589}" --EndProject --Global -- GlobalSection(SolutionConfigurationPlatforms) = preSolution -- Debug|Win32 = Debug|Win32 -- Release|Win32 = Release|Win32 -- EndGlobalSection -- GlobalSection(ProjectConfigurationPlatforms) = postSolution -- {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Debug|Win32.ActiveCfg = Debug|Win32 -- {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Debug|Win32.Build.0 = Debug|Win32 -- {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Release|Win32.ActiveCfg = Release|Win32 -- {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Release|Win32.Build.0 = Release|Win32 -- {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Debug|Win32.ActiveCfg = Debug|Win32 -- {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Debug|Win32.Build.0 = Debug|Win32 -- {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Release|Win32.ActiveCfg = Release|Win32 -- {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Release|Win32.Build.0 = Release|Win32 -- {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Debug|Win32.ActiveCfg = Debug|Win32 -- {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Debug|Win32.Build.0 = Debug|Win32 -- {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Release|Win32.ActiveCfg = Release|Win32 -- {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Release|Win32.Build.0 = Release|Win32 -- EndGlobalSection -- GlobalSection(SolutionProperties) = preSolution -- HideSolutionNode = FALSE -- EndGlobalSection --EndGlobal diff --cc src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.vcxproj index 21a85ef6c,21a85ef6c..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.vcxproj +++ /dev/null @@@ -1,82 -1,82 +1,0 @@@ -- -- -- -- -- Debug -- Win32 -- -- -- Release -- Win32 -- -- -- -- {34681F0D-CE45-415D-B5F2-5C662DFE3BD5} -- gmock -- Win32Proj -- -- -- -- StaticLibrary -- Unicode -- true -- -- -- StaticLibrary -- Unicode -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- <_ProjectFileVersion>10.0.30319.1 -- $(SolutionDir)$(Configuration)\ -- $(OutDir)$(ProjectName)\ -- $(SolutionDir)$(Configuration)\ -- $(OutDir)$(ProjectName)\ -- -- -- -- Disabled -- ..\..\include;..\..;%(AdditionalIncludeDirectories) -- WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) -- true -- EnableFastChecks -- MultiThreadedDebug -- -- -- Level3 -- ProgramDatabase -- -- -- -- -- ..\..\include;..\..;%(AdditionalIncludeDirectories) -- WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) -- MultiThreaded -- -- -- Level3 -- ProgramDatabase -- -- -- -- -- -- $(GTestDir);%(AdditionalIncludeDirectories) -- $(GTestDir);%(AdditionalIncludeDirectories) -- -- -- -- -- -- diff --cc src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_config.props index 441f31cfe,441f31cfe..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_config.props +++ /dev/null @@@ -1,19 -1,19 +1,0 @@@ -- -- -- -- ../../../googletest -- -- -- <_ProjectFileVersion>10.0.30319.1 -- -- -- -- $(GTestDir)/include;%(AdditionalIncludeDirectories) -- -- -- -- -- $(GTestDir) -- -- -- diff --cc src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_main.vcxproj index 27fecd5f8,27fecd5f8..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_main.vcxproj +++ /dev/null @@@ -1,88 -1,88 +1,0 @@@ -- -- -- -- -- Debug -- Win32 -- -- -- Release -- Win32 -- -- -- -- {E4EF614B-30DF-4954-8C53-580A0BF6B589} -- gmock_main -- Win32Proj -- -- -- -- StaticLibrary -- Unicode -- true -- -- -- StaticLibrary -- Unicode -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- <_ProjectFileVersion>10.0.30319.1 -- $(SolutionDir)$(Configuration)\ -- $(OutDir)$(ProjectName)\ -- $(SolutionDir)$(Configuration)\ -- $(OutDir)$(ProjectName)\ -- -- -- -- Disabled -- ../../include;%(AdditionalIncludeDirectories) -- WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) -- true -- EnableFastChecks -- MultiThreadedDebug -- -- -- Level3 -- ProgramDatabase -- -- -- -- -- ../../include;%(AdditionalIncludeDirectories) -- WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) -- MultiThreaded -- -- -- Level3 -- ProgramDatabase -- -- -- -- -- {34681f0d-ce45-415d-b5f2-5c662dfe3bd5} -- true -- true -- -- -- -- -- ../../include;%(AdditionalIncludeDirectories) -- ../../include;%(AdditionalIncludeDirectories) -- -- -- -- -- -- diff --cc src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_test.vcxproj index 265439ec2,265439ec2..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_test.vcxproj +++ /dev/null @@@ -1,101 -1,101 +1,0 @@@ -- -- -- -- -- Debug -- Win32 -- -- -- Release -- Win32 -- -- -- -- {F10D22F8-AC7B-4213-8720-608E7D878CD2} -- gmock_test -- Win32Proj -- -- -- -- Application -- Unicode -- true -- -- -- Application -- Unicode -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- <_ProjectFileVersion>10.0.30319.1 -- $(SolutionDir)$(Configuration)\ -- $(OutDir)$(ProjectName)\ -- true -- $(SolutionDir)$(Configuration)\ -- $(OutDir)$(ProjectName)\ -- false -- -- -- -- /bigobj %(AdditionalOptions) -- Disabled -- ..\..\include;..\..;%(AdditionalIncludeDirectories) -- WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -- true -- EnableFastChecks -- MultiThreadedDebug -- -- -- Level3 -- ProgramDatabase -- -- -- true -- Console -- MachineX86 -- -- -- -- -- /bigobj %(AdditionalOptions) -- ..\..\include;..\..;%(AdditionalIncludeDirectories) -- WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -- MultiThreaded -- -- -- Level3 -- ProgramDatabase -- -- -- true -- Console -- true -- true -- MachineX86 -- -- -- -- -- {e4ef614b-30df-4954-8c53-580a0bf6b589} -- true -- true -- -- -- -- -- -- -- -- -- diff --cc src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.cbproj index 95c3054b8,95c3054b8..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.cbproj +++ /dev/null @@@ -1,138 -1,138 +1,0 @@@ -- -- -- -- {bca37a72-5b07-46cf-b44e-89f8e06451a2} -- Release -- -- -- true -- -- -- true -- true -- Base -- -- -- true -- true -- Base -- -- -- true -- lib -- JPHNE -- NO_STRICT -- true -- true -- CppStaticLibrary -- true -- rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;dclZipForged11.bpi;vclZipForged11.bpi;GR32_BDS2006.bpi;GR32_DSGN_BDS2006.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi;CExceptionExpert11.bpi -- false -- $(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;.. -- rtl.lib;vcl.lib -- 32 -- $(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk -- -- -- false -- false -- true -- _DEBUG;$(Defines) -- true -- false -- true -- None -- DEBUG -- true -- Debug -- true -- true -- true -- $(BDS)\lib\debug;$(ILINK_LibraryPath) -- Full -- true -- -- -- NDEBUG;$(Defines) -- Release -- $(BDS)\lib\release;$(ILINK_LibraryPath) -- None -- -- -- CPlusPlusBuilder.Personality -- CppStaticLibrary -- --FalseFalse1000FalseFalseFalseFalseFalse103312521.0.0.01.0.0.0FalseFalseFalseTrueFalse -- -- -- CodeGear C++Builder Office 2000 Servers Package -- CodeGear C++Builder Office XP Servers Package -- FalseTrueTrue3$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\src;..\include1$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk1NO_STRICT13216 -- -- -- -- -- 3 -- -- -- 4 -- -- -- 5 -- -- -- 6 -- -- -- 7 -- -- -- 8 -- -- -- 0 -- -- -- 1 -- -- -- 2 -- -- -- 9 -- -- -- 10 -- -- -- 11 -- -- -- 12 -- -- -- 14 -- -- -- 13 -- -- -- 15 -- -- -- 16 -- -- -- 17 -- -- -- 18 -- -- -- Cfg_1 -- -- -- Cfg_2 -- -- -- diff --cc src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.groupproj index faf31cab6,faf31cab6..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.groupproj +++ /dev/null @@@ -1,54 -1,54 +1,0 @@@ -- -- -- {c1d923e0-6cba-4332-9b6f-3420acbf5091} -- -- -- -- -- -- -- -- -- Default.Personality -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- diff --cc src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_all.cc index 121b2d80e,121b2d80e..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_all.cc +++ /dev/null @@@ -1,38 -1,38 +1,0 @@@ --// Copyright 2009, Google Inc. --// All rights reserved. --// --// Redistribution and use in source and binary forms, with or without --// modification, are permitted provided that the following conditions are --// met: --// --// * Redistributions of source code must retain the above copyright --// notice, this list of conditions and the following disclaimer. --// * Redistributions in binary form must reproduce the above --// copyright notice, this list of conditions and the following disclaimer --// in the documentation and/or other materials provided with the --// distribution. --// * Neither the name of Google Inc. nor the names of its --// contributors may be used to endorse or promote products derived from --// this software without specific prior written permission. --// --// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS --// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT --// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR --// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT --// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, --// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT --// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, --// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY --// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT --// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE --// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --// --// Author: Josh Kelley (joshkel@gmail.com) --// --// Google C++ Testing Framework (Google Test) --// --// C++Builder's IDE cannot build a static library from files with hyphens --// in their name. See http://qc.codegear.com/wc/qcmain.aspx?d=70977 . --// This file serves as a workaround. -- --#include "src/gtest-all.cc" diff --cc src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_link.cc index 918eccd19,918eccd19..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_link.cc +++ /dev/null @@@ -1,40 -1,40 +1,0 @@@ --// Copyright 2009, Google Inc. --// All rights reserved. --// --// Redistribution and use in source and binary forms, with or without --// modification, are permitted provided that the following conditions are --// met: --// --// * Redistributions of source code must retain the above copyright --// notice, this list of conditions and the following disclaimer. --// * Redistributions in binary form must reproduce the above --// copyright notice, this list of conditions and the following disclaimer --// in the documentation and/or other materials provided with the --// distribution. --// * Neither the name of Google Inc. nor the names of its --// contributors may be used to endorse or promote products derived from --// this software without specific prior written permission. --// --// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS --// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT --// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR --// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT --// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, --// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT --// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, --// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY --// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT --// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE --// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --// --// Author: Josh Kelley (joshkel@gmail.com) --// --// Google C++ Testing Framework (Google Test) --// --// Links gtest.lib and gtest_main.lib into the current project in C++Builder. --// This means that these libraries can't be renamed, but it's the only way to --// ensure that Debug versus Release test builds are linked against the --// appropriate Debug or Release build of the libraries. -- --#pragma link "gtest.lib" --#pragma link "gtest_main.lib" diff --cc src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_main.cbproj index d76ce1398,d76ce1398..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_main.cbproj +++ /dev/null @@@ -1,82 -1,82 +1,0 @@@ -- -- -- -- {bca37a72-5b07-46cf-b44e-89f8e06451a2} -- Release -- -- -- true -- -- -- true -- true -- Base -- -- -- true -- true -- Base -- -- -- true -- lib -- JPHNE -- NO_STRICT -- true -- true -- CppStaticLibrary -- true -- rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;dclZipForged11.bpi;vclZipForged11.bpi;GR32_BDS2006.bpi;GR32_DSGN_BDS2006.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi;CExceptionExpert11.bpi -- false -- $(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;.. -- rtl.lib;vcl.lib -- 32 -- $(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk -- -- -- false -- false -- true -- _DEBUG;$(Defines) -- true -- false -- true -- None -- DEBUG -- true -- Debug -- true -- true -- true -- $(BDS)\lib\debug;$(ILINK_LibraryPath) -- Full -- true -- -- -- NDEBUG;$(Defines) -- Release -- $(BDS)\lib\release;$(ILINK_LibraryPath) -- None -- -- -- CPlusPlusBuilder.Personality -- CppStaticLibrary -- --FalseFalse1000FalseFalseFalseFalseFalse103312521.0.0.01.0.0.0FalseFalseFalseTrueFalse -- CodeGear C++Builder Office 2000 Servers Package -- CodeGear C++Builder Office XP Servers Package -- FalseTrueTrue3$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\src;..\include1$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk1NO_STRICT13216 -- -- -- -- -- 0 -- -- -- Cfg_1 -- -- -- Cfg_2 -- -- -- diff --cc src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_unittest.cbproj index dc5db8e4d,dc5db8e4d..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_unittest.cbproj +++ /dev/null @@@ -1,88 -1,88 +1,0 @@@ -- -- -- -- {eea63393-5ac5-4b9c-8909-d75fef2daa41} -- Release -- -- -- true -- -- -- true -- true -- Base -- -- -- true -- true -- Base -- -- -- exe -- true -- NO_STRICT -- JPHNE -- true -- ..\test -- true -- CppConsoleApplication -- true -- true -- rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi -- false -- $(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test;.. -- $(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test -- true -- -- -- false -- false -- true -- _DEBUG;$(Defines) -- true -- false -- true -- None -- DEBUG -- true -- Debug -- true -- true -- true -- $(BDS)\lib\debug;$(ILINK_LibraryPath) -- Full -- true -- -- -- NDEBUG;$(Defines) -- Release -- $(BDS)\lib\release;$(ILINK_LibraryPath) -- None -- -- -- CPlusPlusBuilder.Personality -- CppConsoleApplication -- --FalseFalse1000FalseFalseFalseFalseFalse103312521.0.0.01.0.0.0FalseFalseFalseTrueFalse -- -- -- CodeGear C++Builder Office 2000 Servers Package -- CodeGear C++Builder Office XP Servers Package -- FalseTrueTrue3$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test;..$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include1$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;$(OUTPUTDIR);..\test2NO_STRICTSTRICT -- -- -- -- -- 0 -- -- -- 1 -- -- -- Cfg_1 -- -- -- Cfg_2 -- -- -- diff --cc src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.sln index f7908da11,f7908da11..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.sln +++ /dev/null @@@ -1,45 -1,45 +1,0 @@@ --Microsoft Visual Studio Solution File, Format Version 8.00 --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-md", "gtest-md.vcproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}" -- ProjectSection(ProjectDependencies) = postProject -- EndProjectSection --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main-md", "gtest_main-md.vcproj", "{3AF54C8A-10BF-4332-9147-F68ED9862033}" -- ProjectSection(ProjectDependencies) = postProject -- EndProjectSection --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_prod_test-md", "gtest_prod_test-md.vcproj", "{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}" -- ProjectSection(ProjectDependencies) = postProject -- EndProjectSection --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_unittest-md", "gtest_unittest-md.vcproj", "{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}" -- ProjectSection(ProjectDependencies) = postProject -- EndProjectSection --EndProject --Global -- GlobalSection(SolutionConfiguration) = preSolution -- Debug = Debug -- Release = Release -- EndGlobalSection -- GlobalSection(ProjectConfiguration) = postSolution -- {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug.ActiveCfg = Debug|Win32 -- {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug.Build.0 = Debug|Win32 -- {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release.ActiveCfg = Release|Win32 -- {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release.Build.0 = Release|Win32 -- {3AF54C8A-10BF-4332-9147-F68ED9862033}.Debug.ActiveCfg = Debug|Win32 -- {3AF54C8A-10BF-4332-9147-F68ED9862033}.Debug.Build.0 = Debug|Win32 -- {3AF54C8A-10BF-4332-9147-F68ED9862033}.Release.ActiveCfg = Release|Win32 -- {3AF54C8A-10BF-4332-9147-F68ED9862033}.Release.Build.0 = Release|Win32 -- {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Debug.ActiveCfg = Debug|Win32 -- {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Debug.Build.0 = Debug|Win32 -- {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Release.ActiveCfg = Release|Win32 -- {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Release.Build.0 = Release|Win32 -- {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Debug.ActiveCfg = Debug|Win32 -- {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Debug.Build.0 = Debug|Win32 -- {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Release.ActiveCfg = Release|Win32 -- {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Release.Build.0 = Release|Win32 -- EndGlobalSection -- GlobalSection(ExtensibilityGlobals) = postSolution -- EndGlobalSection -- GlobalSection(ExtensibilityAddIns) = postSolution -- EndGlobalSection --EndGlobal diff --cc src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.vcproj index 1c35c3a5e,1c35c3a5e..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.vcproj +++ /dev/null @@@ -1,126 -1,126 +1,0 @@@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- diff --cc src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.sln index ef4b057ff,ef4b057ff..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.sln +++ /dev/null @@@ -1,45 -1,45 +1,0 @@@ --Microsoft Visual Studio Solution File, Format Version 8.00 --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "gtest.vcproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}" -- ProjectSection(ProjectDependencies) = postProject -- EndProjectSection --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "gtest_main.vcproj", "{3AF54C8A-10BF-4332-9147-F68ED9862032}" -- ProjectSection(ProjectDependencies) = postProject -- EndProjectSection --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_unittest", "gtest_unittest.vcproj", "{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}" -- ProjectSection(ProjectDependencies) = postProject -- EndProjectSection --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_prod_test", "gtest_prod_test.vcproj", "{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}" -- ProjectSection(ProjectDependencies) = postProject -- EndProjectSection --EndProject --Global -- GlobalSection(SolutionConfiguration) = preSolution -- Debug = Debug -- Release = Release -- EndGlobalSection -- GlobalSection(ProjectConfiguration) = postSolution -- {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug.ActiveCfg = Debug|Win32 -- {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug.Build.0 = Debug|Win32 -- {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release.ActiveCfg = Release|Win32 -- {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release.Build.0 = Release|Win32 -- {3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug.ActiveCfg = Debug|Win32 -- {3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug.Build.0 = Debug|Win32 -- {3AF54C8A-10BF-4332-9147-F68ED9862032}.Release.ActiveCfg = Release|Win32 -- {3AF54C8A-10BF-4332-9147-F68ED9862032}.Release.Build.0 = Release|Win32 -- {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug.ActiveCfg = Debug|Win32 -- {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug.Build.0 = Debug|Win32 -- {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release.ActiveCfg = Release|Win32 -- {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release.Build.0 = Release|Win32 -- {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug.ActiveCfg = Debug|Win32 -- {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug.Build.0 = Debug|Win32 -- {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release.ActiveCfg = Release|Win32 -- {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release.Build.0 = Release|Win32 -- EndGlobalSection -- GlobalSection(ExtensibilityGlobals) = postSolution -- EndGlobalSection -- GlobalSection(ExtensibilityAddIns) = postSolution -- EndGlobalSection --EndGlobal diff --cc src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.vcproj index a8373ce9a,a8373ce9a..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.vcproj +++ /dev/null @@@ -1,126 -1,126 +1,0 @@@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- diff --cc src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main-md.vcproj index b5379fe61,b5379fe61..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main-md.vcproj +++ /dev/null @@@ -1,129 -1,129 +1,0 @@@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- diff --cc src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main.vcproj index e8b763c56,e8b763c56..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main.vcproj +++ /dev/null @@@ -1,129 -1,129 +1,0 @@@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- diff --cc src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test-md.vcproj index 05b05d9ed,05b05d9ed..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test-md.vcproj +++ /dev/null @@@ -1,164 -1,164 +1,0 @@@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- diff --cc src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test.vcproj index 6d7a2f021,6d7a2f021..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test.vcproj +++ /dev/null @@@ -1,164 -1,164 +1,0 @@@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- diff --cc src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest-md.vcproj index 38a5e5663,38a5e5663..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest-md.vcproj +++ /dev/null @@@ -1,147 -1,147 +1,0 @@@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- diff --cc src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest.vcproj index cb1f52b1f,cb1f52b1f..000000000 deleted file mode 100644,100644 --- a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest.vcproj +++ /dev/null @@@ -1,147 -1,147 +1,0 @@@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --